From 7359bb9df8ff01b55e06b91ed1078e28e89a8225 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 14 May 2002 22:04:45 +0000 Subject: [PATCH] Fix frame_right/frame_top screwup. (Detlef Reichl, #78111) Tue May 14 18:02:37 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_realize): Fix frame_right/frame_top screwup. (Detlef Reichl, #78111) * gtk/Makefile.am (install-data-local): Use $(INSTALL_DATA) not $(INSTALL) when installing theme files. (#77094, Ben Liblit) --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/Makefile.am | 6 +++--- gtk/gtkwindow.c | 2 +- 8 files changed, 64 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e0b387c3a..e55313aaa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue May 14 18:02:37 2002 Owen Taylor + + * gtk/gtkwindow.c (gtk_window_realize): Fix + frame_right/frame_top screwup. (Detlef Reichl, + #78111) + + * gtk/Makefile.am (install-data-local): Use + $(INSTALL_DATA) not $(INSTALL) when installing + theme files. (#77094, Ben Liblit) + Tue May 14 17:30:57 2002 Owen Taylor * gtk/gtkctree.c gtk/gtkclist.c: Fix format of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5e0b387c3a..e55313aaa2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Tue May 14 18:02:37 2002 Owen Taylor + + * gtk/gtkwindow.c (gtk_window_realize): Fix + frame_right/frame_top screwup. (Detlef Reichl, + #78111) + + * gtk/Makefile.am (install-data-local): Use + $(INSTALL_DATA) not $(INSTALL) when installing + theme files. (#77094, Ben Liblit) + Tue May 14 17:30:57 2002 Owen Taylor * gtk/gtkctree.c gtk/gtkclist.c: Fix format of diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5e0b387c3a..e55313aaa2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Tue May 14 18:02:37 2002 Owen Taylor + + * gtk/gtkwindow.c (gtk_window_realize): Fix + frame_right/frame_top screwup. (Detlef Reichl, + #78111) + + * gtk/Makefile.am (install-data-local): Use + $(INSTALL_DATA) not $(INSTALL) when installing + theme files. (#77094, Ben Liblit) + Tue May 14 17:30:57 2002 Owen Taylor * gtk/gtkctree.c gtk/gtkclist.c: Fix format of diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5e0b387c3a..e55313aaa2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Tue May 14 18:02:37 2002 Owen Taylor + + * gtk/gtkwindow.c (gtk_window_realize): Fix + frame_right/frame_top screwup. (Detlef Reichl, + #78111) + + * gtk/Makefile.am (install-data-local): Use + $(INSTALL_DATA) not $(INSTALL) when installing + theme files. (#77094, Ben Liblit) + Tue May 14 17:30:57 2002 Owen Taylor * gtk/gtkctree.c gtk/gtkclist.c: Fix format of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5e0b387c3a..e55313aaa2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Tue May 14 18:02:37 2002 Owen Taylor + + * gtk/gtkwindow.c (gtk_window_realize): Fix + frame_right/frame_top screwup. (Detlef Reichl, + #78111) + + * gtk/Makefile.am (install-data-local): Use + $(INSTALL_DATA) not $(INSTALL) when installing + theme files. (#77094, Ben Liblit) + Tue May 14 17:30:57 2002 Owen Taylor * gtk/gtkctree.c gtk/gtkclist.c: Fix format of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5e0b387c3a..e55313aaa2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Tue May 14 18:02:37 2002 Owen Taylor + + * gtk/gtkwindow.c (gtk_window_realize): Fix + frame_right/frame_top screwup. (Detlef Reichl, + #78111) + + * gtk/Makefile.am (install-data-local): Use + $(INSTALL_DATA) not $(INSTALL) when installing + theme files. (#77094, Ben Liblit) + Tue May 14 17:30:57 2002 Owen Taylor * gtk/gtkctree.c gtk/gtkclist.c: Fix format of diff --git a/gtk/Makefile.am b/gtk/Makefile.am index da26d76b67..10a0800891 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -565,11 +565,11 @@ endif # Install a RC file for the default GTK+ theme, and key themes install-data-local: install-ms-lib install-libtool-import-lib $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0 - $(INSTALL) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc + $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key - $(INSTALL) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc + $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key - $(INSTALL) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc + $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 779be00b44..c996d4ab5e 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -3307,7 +3307,7 @@ gtk_window_realize (GtkWidget *widget) attributes.window_type = GDK_WINDOW_CHILD; attributes.x = window->frame_left; - attributes.y = window->frame_right; + attributes.y = window->frame_top; attributes_mask = GDK_WA_X | GDK_WA_Y; -- 2.30.2